More robust relative path handling

5 files changed, 7 insertions, 6 deletions

diff --git a/src/pages/[locale]/furthsettins/index.astro b/src/pages/[locale]/furthsettins/index.astro
index d7a9421..43ff28e 100644
--- a/src/pages/[locale]/furthsettins/index.astro
+++ b/src/pages/[locale]/furthsettins/index.astro
@@ -5,6 +5,7 @@ import translate from '$i18n/translate';
 import tFurthsettins from '$i18n/translations/pages/furthsettins';
 import tSite from '$i18n/translations/site';
 import type Locale from '$types/Locale';
+import relativePath from '$lib/relativePath';
 
 export async function getStaticPaths() {
   return localeStaticPaths;
@@ -20,7 +21,7 @@ const t = translate(locale);
 
     <ul class="link-gallery link-gallery--furthsettins">
       <li>
-        <a href="lallans" class="link link-gallery__container">
+        <a href={relativePath(Astro.url.pathname, 'lallans')} class="link link-gallery__container">
           <div class="link-gallery__image">
             <img src="/images/furthsettins/lallans.jpg" />
           </div>
@@ -28,7 +29,7 @@ const t = translate(locale);
         </a>
       </li>
       <li>
-        <a href="scotsoun" class="link link-gallery__container">
+        <a href={relativePath(Astro.url.pathname, 'scotsoun')} class="link link-gallery__container">
           <div class="link-gallery__image">
             <img src="/images/furthsettins/scotsoun.jpg" />
           </div>
diff --git a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
index 72f07fc..4a26146 100644
--- a/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
+++ b/src/pages/[locale]/furthsettins/lallans/[issueNumber]/payment-success-confirmation.astro
@@ -23,7 +23,7 @@ const issueNumber = new Number(Astro.params.issueNumber).valueOf() as LallansIss
   <section>
     <h1>{t(tPage, { key: 'title' })}</h1>
     <p>{t(tPage, { key: 'payment-confirmation-message', issueNumber: `${issueNumber}` })}</p>
-    <a class="link" href="./">
+    <a class="link" href={`/${locale}/furthsettins/lallans/${issueNumber}`}>
       {t(tPage, { key: 'back-button-text', issueNumber: `${issueNumber}` })}
     </a>
   </section>
diff --git a/src/pages/[locale]/furthsettins/lallans/index.astro b/src/pages/[locale]/furthsettins/lallans/index.astro
index dffe141..65f7b63 100644
--- a/src/pages/[locale]/furthsettins/lallans/index.astro
+++ b/src/pages/[locale]/furthsettins/lallans/index.astro
@@ -17,6 +17,6 @@ const t = translate(locale);
 <Page locale={locale} title={t(tFurthsettins, { key: 'title' })}>
   <section class="section--full-width">
     <h1>Lallans</h1>
-    <LallansIssuesGallery />
+    <LallansIssuesGallery locale={locale} />
   </section>
 </Page>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
index e4f62cb..fe82cf7 100644
--- a/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
+++ b/src/pages/[locale]/furthsettins/scotsoun/[scotsounId]/payment-success-confirmation.astro
@@ -23,7 +23,7 @@ const t = translate(locale);
   <section>
     <h1>{t(tPage, { key: 'title' })}</h1>
     <p>{t(tPage, { key: 'payment-confirmation-message', scotsounId })}</p>
-    <a class="link" href="./">
+    <a class="link" href={`/${locale}/furthsettins/scotsoun/${scotsounId}`}>
       {t(tPage, { key: 'back-button-text', scotsounId })}
     </a>
   </section>
diff --git a/src/pages/[locale]/furthsettins/scotsoun/index.astro b/src/pages/[locale]/furthsettins/scotsoun/index.astro
index cd2e1fe..feb86a3 100644
--- a/src/pages/[locale]/furthsettins/scotsoun/index.astro
+++ b/src/pages/[locale]/furthsettins/scotsoun/index.astro
@@ -17,6 +17,6 @@ const t = translate(locale);
 <Page locale={locale} title={t(tPage, { key: 'title' })}>
   <section class="section--full-width">
     <h1>Scotsoun</h1>
-    <ScotsounCdGallery />
+    <ScotsounCdGallery locale={locale} />
   </section>
 </Page>